Delete documents, refactor services