Cleanup the helpers layer.

Remove an unused method and some leftover comments.