Comment out some broken code for debugging later.
Remove reference to setuserpassword as we don't use that any more