Fix 'make clean'
Update to new Xcp_service interface, accept "-use-switch <true|false>" arg