Cleanup
Partial revert (reverted addition of regular polygons)