removed any more references to mapper generation