more cleanup of support patch.