Remove async handling. Refactor/Tidy.