Remove functions from remaining work