almost buildable
removing some OB references
more clearing up