Remove formerly needed cmake modules
Merge branch 'master' into external_dreme