Moved common async service code to common class
removed test code