Boyscout: cleanup cruft from spike to prepare for merge
Boyscout: strip away all unneeded functionality