deprecation cleanup

support 1.9