Update class refs and remove dead code

Change-Id: I982a7576961a25327bd4b590b7a46c911aaa23ee
Merge "Update class refs and remove dead code"