Reworked things to eliminate activities