cleand up command mess