added option for disabling dropping unused params