Bug 833318 - Replacing Cost Control uses by Usage