Made AddonRemoveCommand a singleton for awhile