Remove a couple of pointless functions