small cleanup
first work on keeping groups and portals