Back out ref and pcmd calls