Fixing un-reachable code