Revert "tidy up"

This reverts commit 54566a1ca77ee7b2736d48b1ce51eb846290fa24.
Revert "extra header fix"

This reverts commit b7545a089f2cedb7b36d61f1ce778ce4921e7bb6.