Remove unreachable code
wip