Removes some of the spec helpers, updates everything to a working verion of compilation.  Having issues with removing cruft.