Cleanup un-used references

Change-Id: Ifc00f7cc745c48b67a4272c49b93835a807bb788