removed obsolete code and comments