Merge "Remove weird, confusing, unreachable code"