Removed old style code