Removed Cleaner TODO