remove tests that covered dead code
fixup some warnings