tidy more dead code