Revert "First steps of creating the crazy shapes"

This reverts commit aa47212a26c64e5e05d3356d53272648a1064f57.