WIP: remove unused options