Takes first steps to reduce duplication

[#82298766]