Removed Menu and other unused code