Entities cleanup