Remove activities and move content into services