Revert "Frameworks: Forward Port Circle Battery and Landscape Battery (2/2)"

This reverts commit 95d646bd929f12d1fadb3b7fb2ca27029a1d75a1.