removed more lingering code