Cleanup for version 6