Better NOWATCH
hlr cleanup