removed a bit more dead code