End user dto clean up