Fixed remove-watch* call - this may or may not actually improve memory consumption and may actually reduce element swapping performance... It's likely there is some improvement in memory consumption though...