Reorganizing Preventive Clearing and cleaning deadcode