Code cleanup
destroy command fixes