Remove redundant watch; Expand on DblClick