Remove more variable, parameters, and statements related to thresholding