Remove asynchronous and fix world saves