merge deleting the (broken) async action stuff