clean up commented-out code in snapsw.h