More cleanup and some code simplification

Still need to clean up some of the commented out code in some of the
menu functions