Cleanup of Branch Merging

Removed initial memory leak fix in favour of more standard form added in
last commit. (Having 2 is redundant)