clean up for v9.00