Remove unreachable code and confusing comment