Remove function until refactor