remove unnecessary code in messagehandler