diff --git a/upgrade_scripts/pgs_box.sql.in b/upgrade_scripts/pgs_box.sql.in
deleted file mode 100644
index 3c259c5..0000000
--- a/upgrade_scripts/pgs_box.sql.in
+++ /dev/null
@@ -1,95 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox(spoint, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION sw(sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION se(sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION nw(sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION ne(sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION area(sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION circum(sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_equal(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box_com(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box_neg(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_box_com_neg(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_box(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_box_neg(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point_com(spoint, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point_com_neg(spoint, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point(sbox, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_cont_point_neg(sbox, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle_com(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle_neg(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_circle_com_neg(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box_com(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box_neg(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_box_com_neg(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle_com(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle_neg(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_circle_com_neg(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line(sbox, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line_com(sline, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line_neg(sbox, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_line_com_neg(sline, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line(sbox, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line_com(sline, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line_neg(sbox, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_line_com_neg(sline, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse_com(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse_neg(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_ellipse_com_neg(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box_com(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box_neg(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_box_com_neg(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse_com(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse_neg(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_ellipse_com_neg(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly_com(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly_neg(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_poly_com_neg(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box_com(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box_neg(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_box_com_neg(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly_com(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly_neg(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_poly_com_neg(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path(sbox, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path_com(spath, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path_neg(sbox, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_contains_path_com_neg(spath, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path(sbox, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sbox, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path_com(spath, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, sbox);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path_neg(sbox, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sbox, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_overlap_path_com_neg(spath, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, sbox);
diff --git a/upgrade_scripts/pgs_circle.sql.in b/upgrade_scripts/pgs_circle.sql.in
deleted file mode 100644
index ddd2ab8..0000000
--- a/upgrade_scripts/pgs_circle.sql.in
+++ /dev/null
@@ -1,31 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION area(scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION radius(scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle(spoint, float8);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_equal(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_equal_neg(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_neg(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION center(scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR @@(NONE, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION circum(scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contained_by_circle(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle(spoint, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle_neg(spoint, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle_com(scircle, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint_contained_by_circle_com_neg(scircle, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION dist(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR <->(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION dist(scircle, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR <->(scircle, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION dist(spoint, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR <->(spoint, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_circle(scircle, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(scircle, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_circle_inverse(scircle, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(scircle, strans);
diff --git a/upgrade_scripts/pgs_contains_ops_compat.sql.in b/upgrade_scripts/pgs_contains_ops_compat.sql.in
deleted file mode 100644
index d0e9c22..0000000
--- a/upgrade_scripts/pgs_contains_ops_compat.sql.in
+++ /dev/null
@@ -1,120 +0,0 @@
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sline, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sline, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sbox, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spath, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spoint, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spath, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spoint, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(scircle, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(scircle, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(spoly, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(spath, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(spoly, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(spath, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR ~(sbox, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR @(sline, sbox);
-ALTER EXTENSION pg_sphere ADD OPERATOR !~(sbox, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !@(sline, sbox);
diff --git a/upgrade_scripts/pgs_ellipse.sql.in b/upgrade_scripts/pgs_ellipse.sql.in
deleted file mode 100644
index 77e2d77..0000000
--- a/upgrade_scripts/pgs_ellipse.sql.in
+++ /dev/null
@@ -1,55 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse(spoint, float8, float8, float8);
-ALTER EXTENSION pg_sphere ADD FUNCTION inc(sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION lrad(sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION srad(sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle(sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse(scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans(sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION center(sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR @@(NONE, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_equal(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_equal_neg(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse_com(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse_neg(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_ellipse_com_neg(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_ellipse(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_ellipse_neg(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point(sellipse, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point_com(spoint, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point_neg(sellipse, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_point_com_neg(spoint, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_ellipse(sellipse, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(sellipse, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(sellipse, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle_com(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle_neg(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_circle_com_neg(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse_com(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse_neg(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_ellipse_com_neg(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle_com(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle_neg(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_circle_com_neg(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_line_com(sline, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_line_com_neg(sline, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line(sellipse, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line_com(sline, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line_neg(sellipse, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_line_com_neg(sline, sellipse);
diff --git a/upgrade_scripts/pgs_euler.sql.in b/upgrade_scripts/pgs_euler.sql.in
deleted file mode 100644
index 8ed4ca4..0000000
--- a/upgrade_scripts/pgs_euler.sql.in
+++ /dev/null
@@ -1,23 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_zxz(strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans(FLOAT8, FLOAT8, FLOAT8);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans(FLOAT8, FLOAT8, FLOAT8, CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION phi(strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION theta(strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION psi(strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION axes(strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_equal(strans, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(strans, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_not_equal(strans, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(strans, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans(strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(NONE, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_invert(strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(NONE, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_point(spoint, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(spoint, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_point_inverse(spoint, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(spoint, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_trans(strans, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(strans, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_trans_inv(strans, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(strans, strans);
diff --git a/upgrade_scripts/pgs_gist.sql.in b/upgrade_scripts/pgs_gist.sql.in
deleted file mode 100644
index aaa0e4e..0000000
--- a/upgrade_scripts/pgs_gist.sql.in
+++ /dev/null
@@ -1,27 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION spherekey_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION spherekey_out(spherekey);
-ALTER EXTENSION pg_sphere ADD TYPE spherekey;
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spherekey_decompress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spherekey_union(bytea, internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spherekey_picksplit(internal, internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spoint_compress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spoint_consistent(internal, internal, int4, oid, internal);
-ALTER EXTENSION pg_sphere ADD OPERATOR CLASS spoint USING gist;
-ALTER EXTENSION pg_sphere ADD FUNCTION g_scircle_compress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_scircle_consistent(internal, internal, int4, oid, internal);
-ALTER EXTENSION pg_sphere ADD OPERATOR CLASS scircle USING gist;
-ALTER EXTENSION pg_sphere ADD FUNCTION g_sline_compress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_sline_consistent(internal, internal, int4, oid, internal);
-ALTER EXTENSION pg_sphere ADD OPERATOR CLASS sline USING gist;
-ALTER EXTENSION pg_sphere ADD FUNCTION g_sellipse_compress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_sellipse_consistent(internal, internal, int4, oid, internal);
-ALTER EXTENSION pg_sphere ADD OPERATOR CLASS sellipse USING gist;
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spoly_compress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spoly_consistent(internal, internal, int4, oid, internal);
-ALTER EXTENSION pg_sphere ADD OPERATOR CLASS spoly USING gist;
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spath_compress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_spath_consistent(internal, internal, int4, oid, internal);
-ALTER EXTENSION pg_sphere ADD OPERATOR CLASS spath USING gist;
-ALTER EXTENSION pg_sphere ADD FUNCTION g_sbox_compress(internal);
-ALTER EXTENSION pg_sphere ADD FUNCTION g_sbox_consistent(internal, internal, int4, oid, internal);
-ALTER EXTENSION pg_sphere ADD OPERATOR CLASS sbox USING gist;
diff --git a/upgrade_scripts/pgs_line.sql.in b/upgrade_scripts/pgs_line.sql.in
deleted file mode 100644
index 3e9c6ce..0000000
--- a/upgrade_scripts/pgs_line.sql.in
+++ /dev/null
@@ -1,41 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION sline(spoint, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline(strans, float8);
-ALTER EXTENSION pg_sphere ADD FUNCTION meridian(float8);
-ALTER EXTENSION pg_sphere ADD FUNCTION sl_beg(sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sl_end(sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans(sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_equal(sline, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(sline, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_equal_neg(sline, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(sline, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION length(sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION swap(sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(NONE, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION turn(sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !(NONE, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_crosses(sline, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR #(sline, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_crosses_neg(sline, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !#(sline, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap(sline, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_neg(sline, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_line(sline, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(sline, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_line_inverse(sline, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(sline, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle(sline, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle_com(scircle, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle_neg(sline, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_overlap_circle_com_neg(scircle, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line(scircle, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line_com(sline, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line_neg(scircle, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_line_com_neg(sline, scircle);
diff --git a/upgrade_scripts/pgs_path.sql.in b/upgrade_scripts/pgs_path.sql.in
deleted file mode 100644
index e40b445..0000000
--- a/upgrade_scripts/pgs_path.sql.in
+++ /dev/null
@@ -1,67 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION npoints(spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint(spath, int4);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint(spath, float8);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_equal(spath, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(spath, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_equal_neg(spath, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(spath, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION length(spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION swap(spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(NONE, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_path(spath, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_path_neg(spath, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point(spath, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point_com(spoint, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point_neg(spath, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_contains_point_com_neg(spoint, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_path(spath, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(spath, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_path_inverse(spath, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(spath, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path(scircle, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path_com(spath, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path_neg(scircle, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_path_com_neg(spath, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path(scircle, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path_com(spath, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path_neg(scircle, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_overlap_path_com_neg(spath, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line(spath, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line_com(sline, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line_neg(spath, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_overlap_line_com_neg(sline, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path_com(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path_neg(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_path_com_neg(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path_com(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path_neg(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_overlap_path_com_neg(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path(spoly, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path_com(spath, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path_neg(spoly, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_path_com_neg(spath, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path(spoly, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path_com(spath, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spath, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path_neg(spoly, spath);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, spath);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_path_com_neg(spath, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spath, spoly);
diff --git a/upgrade_scripts/pgs_point.sql.in b/upgrade_scripts/pgs_point.sql.in
deleted file mode 100644
index 754128f..0000000
--- a/upgrade_scripts/pgs_point.sql.in
+++ /dev/null
@@ -1,14 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint(FLOAT8, FLOAT8);
-ALTER EXTENSION pg_sphere ADD FUNCTION set_sphere_output_precision(INT4);
-ALTER EXTENSION pg_sphere ADD FUNCTION set_sphere_output(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION long(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION lat(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION x(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION y(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION xyz(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION z(spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint_equal(spoint, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(spoint, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(spoint, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION dist(spoint, spoint);
-ALTER EXTENSION pg_sphere ADD OPERATOR <->(spoint, spoint);
diff --git a/upgrade_scripts/pgs_polygon.sql.in b/upgrade_scripts/pgs_polygon.sql.in
deleted file mode 100644
index 6a76b2f..0000000
--- a/upgrade_scripts/pgs_polygon.sql.in
+++ /dev/null
@@ -1,68 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION npoints(spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION area(spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_equal(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR =(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_not_equal(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR <>(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION circum(spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR @-@(NONE, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon_com(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon_neg(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_polygon_com_neg(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_polygon(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_polygon_neg(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point(spoly, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point_com(spoint, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point_neg(spoly, spoint);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_point_com_neg(spoint, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_poly(spoly, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR +(spoly, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_poly_inverse(spoly, strans);
-ALTER EXTENSION pg_sphere ADD OPERATOR -(spoly, strans);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle_com(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle_neg(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_circle_com_neg(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon_com(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon_neg(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_contains_polygon_com_neg(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle_com(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle_neg(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, scircle);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_circle_com_neg(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(scircle, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line(spoly, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line_com(sline, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line_neg(spoly, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_line_com_neg(sline, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line(spoly, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line_com(sline, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sline, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line_neg(spoly, sline);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, sline);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_line_com_neg(sline, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sline, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse_com(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse_neg(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_contains_ellipse_com_neg(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon_com(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon_neg(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_contains_polygon_com_neg(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse_com(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR &&(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse_neg(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(spoly, sellipse);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_overlap_ellipse_com_neg(sellipse, spoly);
-ALTER EXTENSION pg_sphere ADD OPERATOR !&&(sellipse, spoly);
diff --git a/upgrade_scripts/pgs_types.sql.in b/upgrade_scripts/pgs_types.sql.in
deleted file mode 100644
index 95378a0..0000000
--- a/upgrade_scripts/pgs_types.sql.in
+++ /dev/null
@@ -1,24 +0,0 @@
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoint_out(spoint);
-ALTER EXTENSION pg_sphere ADD TYPE spoint;
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION strans_out(strans);
-ALTER EXTENSION pg_sphere ADD TYPE strans;
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION scircle_out(scircle);
-ALTER EXTENSION pg_sphere ADD TYPE scircle;
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION sline_out(sline);
-ALTER EXTENSION pg_sphere ADD TYPE sline;
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION sellipse_out(sellipse);
-ALTER EXTENSION pg_sphere ADD TYPE sellipse;
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION spoly_out(spoly);
-ALTER EXTENSION pg_sphere ADD TYPE spoly;
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION spath_out(spath);
-ALTER EXTENSION pg_sphere ADD TYPE spath;
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_in(CSTRING);
-ALTER EXTENSION pg_sphere ADD FUNCTION sbox_out(sbox);
-ALTER EXTENSION pg_sphere ADD TYPE sbox;