Did some cleanup in the messenger mixin