Remove dead code from SFG