Remove some codes from master branch