Domain objects cleanup