Remove onMessage