self-CR fixes
- identetions
- line removals