Clean up and update celery methods