Remove a couple of redundant functions