cleaned up some unused variables
cleaned up some more useless variables