removing some underscore model methods, adding others