Drop header and reorder.

Adam Caprez requested to merge tom into master

Merge request reports