Try to remove timefactor and concurrency tweaks