Remove (probably deprecated) unused files

Change-Id: Iaf04b6cd7b24df55c0e36ab9821c5399a0be9407
Fix the bug that cmd doesn't work

Change-Id: I004d97288a15e4bdf6a164bc16c2ac63944127b1