Removed options that are no longer needed/relevant