cleaning up some unused variables