Remove User class, simpler to just manipulate hashes