Isn't there any issue open to remove those final key? We should add this change as part of the changelog