Remove function call. Clean up a bit.