Removing folder references from service for now