Removing options, refs #31