Cleanup of Sif0.cpp