removed old control code