tbb and cmake cleanup.. and app non cleanup...