part of sf patch #1121104, Yahoo privacy fixes

This is mostly (all?) just some cleanup