code cleanup
Merge pull request #5328 from Mailaender/superpower-cleanup

IronCurtain/ChronoShift code cleanup