Use static imports.
Remove unused imports and code.
Merge remote-tracking branch 'remotes/origin/master' into repl
Remove unused import.