Removing queues. Not required for MVP