Fix missing classes and remove unnecessary

Change-Id: I0dc51d53de050b2a053d2b8da044d06a0cd63a67
2 files changed