Removed commented code and removed imports that aren't required.