deletes unused code
Merge remote-tracking branch 'yuta/master'