WIP: Remove multithreading