Removing some of the location test code -- the output is getting annoying.