Cleanup commands handling