Cleaned WatchManager a little (but it should use the watcher recipes)

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>