Changed clumsy password removal in favor of simply not serializing it.