cleanup in destructor, instead of of everywhere manually
Authored by: heiko 2013-01-23
Parent: [r495]
Child: [r497]