Remove unused

removed unused variables and imports