Options parsing updates
Removed unnecessary typeclass