I applied your patch and all references are gone. Sorry for the noise.