Service hierarchy created, tidying up