got rid of mapper