Async cleanup and bugfixe