Removing old code and tests, updating the Header test and README