More code cleanup, entities are no longer chunk specific (finally)