===> Cleaning for xev-1.2.1