FIXED #24. Added cleanup task for async calls.