removed obsolete code, comments