Removed some unneeded imports and references.