Removed useless switch statement