code cleanup , removed the places where there are passwords.