Cmake fixes

This is a small update that fixes an issue with CMAKE_POLICY and
CMake 3.0 and removes obsolete code.