remove pointless wrapper functions