Moved code out of service header.