cleanup - align on 6.0