Remove pointless namespacing of API