Remove more direct references to usage module.

Change-Id: I05ae9e5d4aee7af177224fa032221caf27c57a60