Clean up and use Metasploit::Credential