Cleanup, don't even need z here.