OK, let's leave it in now. When we get more automated tests we can do more clean-up.