minor clean-up; trying to fix staging/live errors