cleanup + test clickstart on test-clc branch