remove System::Command usage