Removing code from the switch-case area