This removes the public facing API. Technically it should be deprecated.