cleanup, mass properties, etc