2.0 remove deprecated finish calls