Changed delete implementations to make sure a watch will be triggered