removign crappy code