Remove an unused struct element

Also simplify an if/else into just an if as suggested by golint.