Remove Messenger from system, add to AROMA

Description says it all