Commented out unreachable code. What was it for? Reduced # warnings