Cleaned up menu classes.