Clean up using statements
Merge branch 'master' of github.com:usuyama/hapmuc
Cleaned up using statements