Cleaning up some unneeded variables