change cli to use (type, hrn) instead of record in remove calls