Finishing up the Remove functionality.  Again, quite a bit trickier than anticipated.