- Removed most of version 1 code

! However, full row removal does not work