Removed old Ribbon variables and other cleanup.