Removed loads of stuff