Added ability to remove options