Cleaned up some more USER dependencies.

32 files changed