Remove dead/deprecated code
XD-2198 Refactor and simplify module registry