remove code not part of the repo
Merge remote-tracking branch 'origin/master'