code cleanup / removed unnecessary async calls