Deleted some useless code.
Deleted some useless code.
Merge branch 'v2'