Cleanup of Sif2.cpp