Fixes to remove button and KVO behavior
Wrestling with nasty Core Data thread bug; this commit seems to be more stable