proxy recipe and code clean up