Minor style fixes: removed unused imports, commented-out code, etc.