Cleanup various commands

thanks