comment obsolete code
cleanups