remove unneccessary code - switch to object based async