t571 - a few cleanup items.