Continuing cleanup

openexr-cmake