Removing unnecessary options