Remove unused code from Command