Bugfix: cleanup