Domain model cleanup