remove async refactoring that lead to races