Tidy up PBKDF2