fix mention removal