Clean up mapper class.