Remove old stuff that is now in common