Removed some return values that didn't need to be passed.