Change removeGuider to take a guider as parameter.

Also, fix some small doc issues.

Change-Id: I92c7e89f2bdcae4c8d9ebf565af23d2b0ea8ffd8