make golint happy
remove/fix unreachable/dead code