improve for remove timeout

Change-Id: I757200e10c748cd01026be7e089e51ec52aa0912
Signed-off-by: li levi <levi.li@sap.com>