Cleanup and added repos counts