Cleanup for message control code.