removed obsolete code