Cleanup of Sif1.cpp

Some unused functions.
Collapse it in to main functions so that it is easier to (re)move.