Added hooks for RabbitMQ messaging, more deployment cleanup