Cleaning up some unused variables