Removing old code that didn't get removed in the merge