Minor cleanup
UUID support update
Cleanup command handling