Took out old controls code