I was adding comments into your commit, not the pull request, so see your commit for my previous comments. With mana battery and power supply being stock, these are also not needed, you don't need to reference either at all.