Remove service and test references