Remove pbkdf2 and put in utilities