Clean up response/maps relations