Cleaned up a few USER dependencies.

9 files changed