added option to skip torch removal