Preparing for multi-threaded, also cleaning up