Cleaning Domain model