Remove unnamedplus for now, this is causing trouble on Mac.