removed unused variables II