Removing old async code