- Attempt fixing some potions not getting removed by removing all potion effects instead of active potion effects
- Fixed a potential issue where at the end of the game you'd keep the invisibility
- Cleaned up the code