replace remove API calling with alternate one