remove cmd bugs fixed