remove all mapper stuff ... no longer even an optional argument. there is no real benefit in terms of performance in having the mapper called within the function, leave it out for clarity and simplicity.