Delete unnecessary requires and make msftidy compliant
Land #2546, minor OS X persistence fixes