Removed useless switch