Removed some unreachable code