clean entities 2