refactor(organizations): code cleanup and patch data cleanup in account settings and tos view TASK-1292

refactor(organizations): code cleanup and patch data cleanup in account settings and tos view TASK-1292 #861