one more old cleanup