Fix keys migration, remove default key add from config