Merge "Remove watchprops."