Cleanup botched merge