Merge "Clean up CLI integration project" into main