Revert "st_wedge"

This reverts commit 49d7e7511387ee879e6a0efa4acd5009546a58f9.
Revert "circle and annulus"

This reverts commit 81aef48491ab5487743acf85287c46a876dfaca7.