Removed hasQueueName and cleaned up a lot of things