- Remove unused function - Rename some functions and make them static - Reorder freeing of menu entries