Try removing some unused code?