Remove secondary hop type, and add aroma and mash as per the spec