Remove non-options: #324