Removed unused <span> tags