[WCP-34] [WCP-50] - Clean up service package.