DTO clean-up