remove even more dead code