remove deprecated annotations for back-port