More work on the password thingy
...
Remove strategy again