removed unused variables and imports