Add deletion of bag contents.
Some refactoring.
Bit more refactoring.