Revert "Work on gate connecting and rendering"

This reverts commit 07b785a13b43827273a2e1cfdaaf9b91bd202121.