Task service & controller cleaning