Remove unused variable
Code changes to support new options