Remove options from here since htey will bes etp properly later