Commented out some unused variables and fixed other xbuild warnings