Merge "Refactored Delete SchemaSet functionality"