remove more references to :who