Removed unnecessary command value and commented code