I must admit to still being confused. I have checked in my changes to remove-unused as part of getting checkHandlers up and running (it now passes all tests). Could you make the changes you think are still needed and I will take a look to see if the code makes sense to me?