Improve tags parser code

Removes a duplicate file

Change-Id: Ib44682281a7fb2d473c07e7cec7852b4755b15d8