Removed celery, integrated with CLIFF 0.71