SSP-2303 Re-enable map_term_note cleanup