cleanup unused variables