Bug 937251 - [Cost Control] Remove proxy