Remove duplicate generation from compute