delete obsolete code
remove more obsolete code