Remove Options class