Removed redundant type definitions (makes go build -gcflags=-s happy)

Minor cleanup, removed type definitions that were unnecessary.