Removed header retrieval functionality from the service layer and bring

up to webservice layer