latest changes/git cleanup