Revert "'Circle Panel' + 'Cirle' + 'Rectangle'"

This reverts commit 8444d4d7bda625207f7d4d4b25cc3f93edb3b482.