Updated BOF schema and removed cruft.