cleanup CMakeLists and qiproject

Change-Id: I9e20381814e047e0cbdcdd3fd516db24aea17d73