Removed more old code