removed loads of stuff I didn't need