Changed over to using options
Removed unneeded code