rm more dead code