remove obsolete code/imports