Fix formatting
Remove unused options