Cleaned up unnecessary Users stuff that's already in the plugin