Cleaned up delete team service