Cleanup for validation in ortt+fusion-health