Remove pbo as it was causing consistent merge conflicts and we can construct it from the unpacked folder.