Removed switches

They're evil.