Include geometry.
Reintroduce cleanDoc.