clean up service code, disable promise tests that are not working the same any more