Tidying up at start of CR4