Clean up for 6.2