Cleanup CM Mess and Prepare for GK

Change-Id: I1bd628ff556552b1ac9a1530ce53bf74f12ce10c
Remove Terminal Emulator Stuff

Change-Id: Ib4d7667c498e5084a2486f31057cc69cb3f2193f