Remove hard dependancy on stdlib 3