Removed options, should have been kept in a local branch