remove more obsolete code