Fixed: Don't need those spans