This second patch removes a few extra lines I added by mistake when I 
merged my private repo to the one for submission.