Cleanup, make async once again