cleanup obsolete code