WINTERMUTE: Remove commented out code.
WINTERMUTE: Fix formatting in persistent.h