Removed a couple of functions that had gotten duplicated.