[SerialICE] New patch to review for serialice: Cleanup on walk_pre_hooks