Removed more old style code