Clean up and refactor mmodule over to saltutil per #10273