Remove strict maps from rivers memory model