removed some files and handled queues