Removed unessary data classes.
Finished discover_users