CMAKE: some cleanup