Handle automatic removing of watchpoints and cleanup at the end