Cleanup in Groups & Projects apps