remove cross-version compatibility code
2 files changed