Automated cleanup, mostly final variables and unused imports