Removed troublesome functions, temporarily anyways.