Header cleanups