Many deletion related fixes and changes
Bumped version