Remove some unused code (observer, and some includes).
Make work when in onboard mode.