Removing old Options class