Revert "Partial commit - WIP - Menu module connector"

This reverts commit 53696a4e5528e6667f2d085b2a1d88ec0a92be4b.