code cleanup, pass1/CMakeLists.txt system independet