fixed up remove...it got much faster, but still at ~50% correctness :(