Remove celery. Some fixes and re-org in the fab file.