Move utility function out of service