Removed old implementation in favor of proper variable watch