Project cleaned to make it easier to upgrade Optix