Remove old code
Only store password if user requests it.