Remove function causing real problems.