Taking out some unneeded headers