Remove unused imports, avoid reserved words