Rearranged and removed legacy stuff.
Prep for change username.