Initial cleanup before the revamp.