Cleanup and fixes for world reset