fix: menu removal and unused code