More leaderboard cleanup and optimization