Further phantom references taken out.

Signed-off-by: Tushar Narayan <tusharnarayan@gmail.com>