Remove async stuff. Going to approach it differently