Fix typo and remove duplicate source file

Change-Id: I65d6b1f3b9fa4d3e760b4be9b935af365a52cbaa