Remove unused structures.
Move the place of a curly bracket. This is just a cosmetic change.
Merge pull request #918 from monaka/pr-remove-unused-struct-and-more

Remove unused struct and more