Remove async features and implement assembly and namespace changes to project files