stubbing in new component systems
removed stale headers