Added extra check for empty ring span
Commented out redundant lines