Removed Chengyang's stuff from master branch to avoid duplicates and confusion