Removing dependence on Commands.Utilities