Remove Match from Module constructor, instance is set during loading of Match