This reverts commit 6e79b93a5316bf51d05dd432fabdcba5ea95b53f.
* Ongoing * refactor * test * Add cleanup task * refactor