Remove unused imports, more formatting fixes