Revert "Merge Conflict fix redo"

This reverts commit c2fcc66357b0b1a0325ec084eda92938808d8494.
Revert "Forgot a wire"

This reverts commit 108515ee191956401b570dcd842a4e5d0eac4376.
Revert "Xenoflora + misc changes"

This reverts commit 4798513820e8a6134cf304405cf9f3c2f0fc340d.