rb: use the rb_remove function where it needs to be