impl removeWatch and add test coverage