===> Cleaning for swappy-1.8.0