Remove more unused async stuff, remove debug output