Revert "Fixed the menu activation"

This reverts commit 2468801f85b8365dc2e0e3364adf95b466be0aa0.
Fixed menu activation with 2 TODOs