MessageDefinitions clean up
Custody from Strategy to StrategyController