Remove 'switch' from the database
Fix minor errors in switch removal
Merge branch 'devel' into no-switches
Merge pull request #293 from gsilvis/no-switches

Remove 'switch' from the database