clean up message model