trying (again) to get rid of password info