Add Cleanup-Task and changed dependency

Fixes #2