Some cleanup before real change