Controllers cleanup.
Domain objects cleanup.