removed old cruft
removed more old cruft