Minor cleanup

- Fix comments
- Remove all references to wikitech

Change-Id: I101a8bb8d512a7da165f5fab0c83e4d2d3fae3ad