[0008] removed few entities