Remove dependency to activitiesController