KeyGenerator cleanup & password-based keys