Added executor_amqp
Clean unneeded stuff from executor_amqp