remove watcher entity, fix formula