Cleanups - combine certain headers