Added relevant mappings to data; Cleanup;  refs #15265