Remove unused variables and imports
Clean trailing spaces