Better concurrency & deleted some files