Removed unnecessary options and the like