Removed global kernel calls in entities