first pass of cleaning up civic inventory interaction