MenuSystem is header only
Trying include cleanup - may cause issues!