copy change from rabbit_amqqueue_process to slave
for consistency
tidy up