Remove unused variable
Remove dead code after returns