removed watch scripts and minor housekeeping