Simplify build, make pure sisu

blah, have to keep this around seperate, since security uses it.