Forgot to remove a couple of redundant functions.