Organizational changes

Clean up and disabiling of some options