Remove reference of Creator to replace with TeamFactory