delete loads of unnecessary code