Revert part of the last commit

keep the original upstream
Delete unused files and comments