[#237] Clean up unreachable code