4 files changed, 7 insertions, 11 deletions

diff --git a/src/solvers/coord/dr.h b/src/solvers/coord/dr.h
index d986742..7f7af4f 100644
--- a/src/solvers/coord/dr.h
+++ b/src/solvers/coord/dr.h
@@ -12,10 +12,6 @@ STATIC size_t coordinate_dr_gendata(unsigned char *);
 
 STATIC bool is_eoco_solvable(cube_t);
 
-/* TODO: remove the following two when all coordinates are converted to unsigned */
-STATIC uint64_t coord_co_u(cube_t c) { return (uint64_t)coord_co(c); }
-STATIC cube_t invcoord_co_u(uint64_t i) { return invcoord_co((int64_t)i); }
-
 STATIC coord_t coordinate_dr = {
         .name = "DR",
         .coord = &coordinate_dr_coord,
@@ -54,8 +50,8 @@ STATIC coord_t coordinate_dr = {
                 .coord = &coord_dreoesep_nosym,
                 .cube = &invcoord_dreoesep_nosym,
                 .max2 = POW_3_7,
-                .coord2 = &coord_co_u,
-                .cube2 = &invcoord_co_u,
+                .coord2 = &coord_co,
+                .cube2 = &invcoord_co,
                 .merge = &coordinate_dr_merge,
         },
 };
diff --git a/src/solvers/coord/dreo.h b/src/solvers/coord/dreo.h
index f6fa3e9..31f7008 100644
--- a/src/solvers/coord/dreo.h
+++ b/src/solvers/coord/dreo.h
@@ -47,8 +47,8 @@ STATIC coord_t coordinate_dreo = {
                 .coord = &coord_dresep_nosym,
                 .cube = &invcoord_dresep_nosym,
                 .max2 = POW_3_7,
-                .coord2 = &coord_co_u,
-                .cube2 = &invcoord_co_u,
+                .coord2 = &coord_co,
+                .cube2 = &invcoord_co,
                 .merge = &coordinate_dreo_merge,
         },
 };
@@ -56,7 +56,7 @@ STATIC coord_t coordinate_dreo = {
 STATIC uint64_t
 coord_dresep_nosym(cube_t cube)
 {
-        return (uint64_t)coord_esep(cube) / COMB_8_4;
+        return coord_esep(cube) / COMB_8_4;
 }
 
 STATIC cube_t
diff --git a/src/solvers/coord/eo.h b/src/solvers/coord/eo.h
index 7735319..b963832 100644
--- a/src/solvers/coord/eo.h
+++ b/src/solvers/coord/eo.h
@@ -44,7 +44,7 @@ STATIC cube_t
 coordinate_eo_cube(uint64_t c, const unsigned char *data)
 {
         cube_t cube = SOLVED_CUBE;
-        set_eo(&cube, (int64_t)c);
+        set_eo(&cube, c);
         return cube;
 }
 
diff --git a/src/solvers/coord/gendata.h b/src/solvers/coord/gendata.h
index 7118b08..678bfd7 100644
--- a/src/solvers/coord/gendata.h
+++ b/src/solvers/coord/gendata.h
@@ -29,7 +29,7 @@ gendata_coord_dispatch(
                 return NISSY_ERROR_INVALID_SOLVER;
         }
 
-        return (int64_t)gendata_coord(coord, buf);
+        return gendata_coord(coord, buf);
 }
 
 STATIC size_t