cleanup and complete import to github