cleanup: these are now generic combine all

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>