Revert "Forward Port Circle Battery (WIP)"

This reverts commit 95e8243dcdab79744fc67aadce4703f2ac99a93d.