WELD-1781 Get rid of activities