comment signals and remove ApiTest code