CON-1672 | 3rd party verticals expansion cleanup