Removed more old code.