[#530] Remove org & groups old info
[#530] Improve readability