Cleanup to fix golint warnings and remove unused types.