removed unnecessary message manipulation