cleaning onMessage