Improve generate performance (remove watch temporarily)