Cleanup technical debt

* Unused variable
* Not necessary trailing /

Change-Id: I65c8801b44ff8870426a03fdab2710a67b8a20cc