PRESF Cleanup - Base Driver Updates