Merge "Remove code that seems unneccessary & has a leak" into rvc-dev