Remove generic get/registerClass Mixin, Refactor, Cleanup