removed old code
cleanups