Added Route Cleaner. Fixed few bugs