Code Cleanup: simplified update function dependency code