Remove all references to on_hand