More cleanup, added build script