Options refactor
Removed unnecessary functionality