Annoying messages cleanup