Fix unused_code
warnings without experimental
#2482
Merged
unused_code
warnings without experimental
#2482