Removed unnecessary entities