Clean up for release 1.6