Remove performance information from solution
Remove spurious headers and unit test