Removed obsolete clean code