Removed the old header check and refactored the new check.