Remove duplicate files / fix build

Change-Id: I398f4b5b905e28305c0f673ecba5c3b2c26bbb94
Signed-off-by: sethyx <sethyx@gmail.com>