Fixed CMakeLists.txt 

Removed files from different branches.