Cleaned up code.
Deleted unused options.