===> Cleaning for genius-1.0.15