===> Cleaning for scooter-0.6.0