Added already downloaded-queue, removed redundant code