Cleaned up calls to world_factory and useless DebugLog() calls