Updated to 9.1.1
Unnecessary code
Organizing options