diff --git a/zuul/driver/timer/__init__.py b/zuul/driver/timer/__init__.py
index 4db779bae4..b8979c4a6e 100644
--- a/zuul/driver/timer/__init__.py
+++ b/zuul/driver/timer/__init__.py
@@ -76,12 +76,12 @@ class TimerDriver(Driver, TriggerInterface):
                     jobs.append(job)
 
     def _onTrigger(self, tenant, pipeline_name, timespec):
-        for project in tenant.layout.projects.values():
+        for project_name in tenant.layout.project_configs.keys():
             event = TriggerEvent()
             event.type = 'timer'
             event.timespec = timespec
             event.forced_pipeline = pipeline_name
-            event.project_name = project.name
+            event.project_name = project_name
             self.log.debug("Adding event %s" % event)
             self.sched.addEvent(event)
 
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py
index 4ae7f35a2a..680704e208 100644
--- a/zuul/manager/__init__.py
+++ b/zuul/manager/__init__.py
@@ -67,15 +67,16 @@ class PipelineManager(object):
         def log_jobs(tree, indent=0):
             istr = '    ' + ' ' * indent
             if tree.job:
+                # TODOv3(jeblair): represent matchers
                 efilters = ''
-                for b in tree.job._branches:
-                    efilters += str(b)
-                for f in tree.job._files:
-                    efilters += str(f)
-                if tree.job.skip_if_matcher:
-                    efilters += str(tree.job.skip_if_matcher)
-                if efilters:
-                    efilters = ' ' + efilters
+                # for b in tree.job._branches:
+                #     efilters += str(b)
+                # for f in tree.job._files:
+                #     efilters += str(f)
+                # if tree.job.skip_if_matcher:
+                #     efilters += str(tree.job.skip_if_matcher)
+                # if efilters:
+                #     efilters = ' ' + efilters
                 tags = []
                 if tree.job.hold_following_changes:
                     tags.append('[hold]')
@@ -89,10 +90,11 @@ class PipelineManager(object):
             for x in tree.job_trees:
                 log_jobs(x, indent + 2)
 
-        for p in layout.projects.values():
-            tree = self.pipeline.getJobTree(p)
+        for project_name in layout.project_configs.keys():
+            project = self.pipeline.source.getProject(project_name)
+            tree = self.pipeline.getJobTree(project)
             if tree:
-                self.log.info("    %s" % p)
+                self.log.info("    %s" % project)
                 log_jobs(tree)
         self.log.info("  On start:")
         self.log.info("    %s" % self.pipeline.start_actions)
diff --git a/zuul/model.py b/zuul/model.py
index 2c3c7b33eb..00de0071d4 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -1827,7 +1827,6 @@ class Layout(object):
 
     def __init__(self):
         self.tenant = None
-        self.projects = {}
         self.project_configs = {}
         self.project_templates = {}
         self.pipelines = OrderedDict()