Removed the, somewhat complex but interesting, sigc stuff.