Remove some components, so engine design can be talked over