Remove underscore wrapper methods...