Clean up & fix bug reloading repo not taking into account new token key