Adjusting more sage-banner calls and clean up old mess

Package-Manager: portage-2.2.0_alpha163