Cleaned up code by removing User and Users Classes