Remove internal menu var in favor of partially applied functions