Removing proxy code