Remove async methods and other improvements

Change-Id: I6cd0fd12f097e232d074e1a882ea62f414a5aca6