domain classes cleanup.