Refactor a part of consumption of messages and remove unnecessary messages