Fixes janiborg trashbag emptying
Merge pull request #6652 from AnturK/cleanup