Remove lerigherag and switch on .message