Continued purge of old code
Changed base PV name