Got rid of Await call
Cleanup, settings