fixup! Cleanup swift options