Merge "Clean up genius csit yaml"