Some cleanup work