Merge "Remove more wrappers" into pi-dev