Revert "Fixing error when removing Firework Groups"

This reverts commit 101398899ff602f58d1d5729e72cd861d2f12194.
Revert "Tons of changes, a bit buggy though"

This reverts commit 3ae4441a2ab9df55c9afad3f156971c95d705341.