Remove dup symbols and cleanups, builds on OSX