Phone receive fix + Removing extra msg classes