Proxy recipe and code cleanup