remove/rename obsolete code