Improve watching
Remove unneeded flag