cleanups after a second rebase but still does not build.  Really need to do a proper squash soon.