CMake files cleanup

Okay it's done :-)