Split ActivityService into ActivityUtils and Activity services
Fix messages and add timeout for auto removing them