maintain geometry and clean up the modeling