Remove more unnecessary options