Cleaning in the entities