removed debug code and unused variables