removed unused variables & imports