trying to cleanup the header!