Removed useless files, minor update of config file and CMakeLists.txt.