Revert "GroupE"

This reverts commit f4438c4673a0460b3a4f720d52d25b3a76de9f5b.