Removal of unnecessary routines. Cleaner