unused variables fixed