Cleanups
HACK: draft of  FastBoot Proof of Concept