Removing Jade AID from message classes
merging