remove more dead code