removed old, unneeded code