removed unused/commented options