Code cleanup: imports, packages, unused code.