Remove final deprecation warning