cleaning up repo to match upstream master