Removed some segfault; does still not delete all the watches if var is removed, might segfault