CLI debug cleanup