Sorting the sub header issue

… by removing it. For now.