Remove old MenuBar code, update comments