Remove bunch of useless code
Merge pull request #1 from kelvinyap92/2.0

Remove bunch of useless code