Add initial version with patching to support github account
Delete some unused code