Cleanup of remove task but it is still broken