object model cleanup