Remove nonexistant classes and update existing ones

Change-Id: I34bc23e6b8d52f521d08a0c6ec3db6f5491485b0
1 file changed