[#219][#90] Remove codelist constraints