More cleanup. Removed boot bar code (useless anyway).