Cleanup strings
PR fixups
Add back removed TODO cleanup because it breaks the logout button