Cleaned up some E19 stuff with new menu patch