Remove switches

Merge fix from @jstart