Add accountId + remove unused group pages