declutter mode and fix remove bug