removed user/password stuff (part 1)