Removed commented-out code.
Removed unused import.