Cleaned up the code a bit

I mostly removed a bunch of commented out lines of code and imports that
were old implementations of stuff or not needed.

I also added the skeleton for the planned updating of the user.