Unused code removal (refs #38)