Removed all references to old message controller