Fix unhandled case option errors
Remove unneeded commented out line