Removed some unused imports/code.