fix obsolete header blocks