Function Refactoring wip (remove unreferencedArguementValidator's)