[PVP] Got rid of some export()s that should be unecessary