Removed switch statement