Merge pull request #10 from alandbarroso/develop

Reorganizing Preventive Clearing and cleaning deadcode