Remove and/or cleanup more Async.waits in html