many clusters and delete unused vars
minor changes in cmake
change flag in cmakelists