Cleanup of c yaml assistant