π Some cleanup.