first commit and some removals