Remove watch using to simplify the boilerplate