cleanup and removed api keys