Some cleanup v.2.