Remove unused variable
Add redirection to new case