Removing any more traces of that horrible PR and it's trail of error
bugs