Fixes #564 - Old code from previous menu approach removed. (now processed inside shortcode handler)