Fix warning.

Change-Id: Ibbad962a265a79a7db3d27f8cd71c8d69e999950
Remove unused/non-compiled classes.

Change-Id: I51d5a6905560bde239f801fc2b1d6328e9f6e73f
Merge topic 'cleanups' into next

0887201a Remove unused/non-compiled classes.
a35ca9c1 Fix warning.