Cleanup unnecessary comments/code.
Additional cleanup.
Basic menu introduced