#639 remove unused fields and functions.
Merge pull request #643 from crow-misia/remove_unused_fields_functions

Remove unused fields and functions.