[Feature] - Cleaner

Please merge this branch to master