Update strings / Remove extra files

Change-Id: Ibf07ec0a9752ebae4c4f0f565808ed3f024db5d3