Merged hook changes from experimental
Removed unused Preplanning testing
Removed unused SimpleMenu