Changes to messages. Disabled some unused features.