Remove unused stuff.

Change-Id: If733fef2e11349c7d07d36c476521f26916a0318
Remove debug leftovers.

Change-Id: I8d800829fe2f404810575d767cff864cf74cc80b
Merge "Remove unused stuff." into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2