Removed depricated code
Updated cleaning process
Cleanup