rewrote remove, still seg faults (gdb says at 141?)