Removed switch class