Removing garbage header
Laying the ground work for the move to hashing (finally merging in work from experimental branch)