Remove useless code and change key server for a more reliable one