removing cruft and some more celery tuning
cleanup more cruft