[🔨] Checkin: 90-get-rid-of-unnecessary-switch-statements

[🔨] Checkin: 90-get-rid-of-unnecessary-switch-statements #34