watch remove fix