Fixed header_remove errors