Cleanup of the watch api