The models bundled in controller's model-inventory are only used by OpenFlow world, starting with OpenFlow Plugin. Remove them from controller and let OpenFlow Plugin host them and evolve them as needed.