Clean up CMake package finding