Post-refactoring removal of some unnecessary code.