cleanup more old code from legacy controller