cleaned up unwanted menu entries, cleared up some functionality