Cleanup, force 10.7