removed loads of code
removed again loads of unused code