Simplified the codeholder code: pure refactoring: just removed three classes