remove unused file/remove unused function
fixed Makefile
Merge pull request #2 from masayukioguni/refactoring

Refactoring