Removing legacy code
Merge pull request #78 from WonSong/master

Removing legacy code