update to cleanup data mappers