Optimize MQ messages and delete a couple of redundant methods

(less queries, wohooo)

@frsela r?