Removing unused imports, unused local variables