House Cleaning

removed obsolete code