Remove work around left in when testing potential issue with watch.
Merge pull request #43 from onetruebob/refactor/removeWatchWorkaround

Remove work around left in when testing potential issue with watch.