FLEX-34605 cleanup