Add cleanup task to ease development