removing useless message headers and improving tasks