Drop out beforeUseConverter
Merge with drop-beforeuseconverter