Some cleanup...