Remove some pointless functions