Cleaning up after all the testing as Google seems to disagree with itself