Remove 'switch' from the database

Sure does.  I'll fix that.