Some cleanup.'